overviewControls: Remove intermediate box

Now that the workspace switcher moved into the view selector, the
box only holds a single child. Cut out the middle man and add that
directly to the parent.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1609>

diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index af420c5289806960895b65ba3f88978b81a642f4..e87c5042a88d3b18c69b960dfaea8051f0053c83 100644 (file)
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -85,13 +85,7 @@ class ControlsManager extends St.Widget {
         });
         this.add_actor(this._group);
 
-        const box = new St.BoxLayout({
-            x_expand: true,
-            y_expand: true,
-        });
-        box.add_child(this.viewSelector);
-
-        this._group.add_child(box);
+        this._group.add_child(this.viewSelector);
         this._group.add_actor(this._dashFader);
 
         this.connect('destroy', this._onDestroy.bind(this));

diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 5a22cb2152e6d00046f886ecbb4e661b9bdc18b3..6655ed31f6be2c5c535408f61d5161ca8c61c07d 100644 (file)
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -241,6 +241,7 @@ var ViewSelector = GObject.registerClass({
         super._init({
             name: 'viewSelector',
             x_expand: true,
+            y_expand: true,
             visible: false,
         });